From: Ian Campbell Date: Fri, 15 Feb 2013 13:32:07 +0000 (+0000) Subject: xen: arm32: Don't bother with the bootloader provided ARM-Linux machine type X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7285 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=107b7c0badd422ffba9342cb237eda73ec6373d4;p=xen.git xen: arm32: Don't bother with the bootloader provided ARM-Linux machine type Everything is DTB based and on 64-bit there is no such concept even in Linux. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Committed-by: Ian Campbell --- diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 20e9da6228..92fc36c6d6 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -72,7 +72,7 @@ past_zImage: cpsid aif /* Disable all interrupts */ /* Save the bootloader arguments in less-clobberable registers */ - mov r7, r1 /* r7 := ARM-linux machine type */ + /* No need to save r1 == Unused ARM-linux machine type */ mov r8, r2 /* r8 := ATAG base address */ /* Find out where we are */ @@ -334,9 +334,8 @@ launch: add sp, #STACK_SIZE /* (which grows down from the top). */ sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ mov r0, r10 /* Marshal args: - phys_offset */ - mov r1, r7 /* - machine type */ - mov r2, r8 /* - ATAG address */ - movs r3, r12 /* - CPU ID */ + mov r1, r8 /* - ATAG address */ + movs r2, r12 /* - CPU ID */ beq start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index e1ab7f642a..7e3586057a 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -329,7 +329,6 @@ void __init setup_cache(void) /* C entry point for boot CPU */ void __init start_xen(unsigned long boot_phys_offset, - unsigned long arm_type, unsigned long atag_paddr, unsigned long cpuid) { diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index c7a586b3b8..da4880c4c2 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -132,7 +132,6 @@ make_cpus_ready(unsigned int max_cpus, unsigned long boot_phys_offset) /* Boot the current CPU */ void __cpuinit start_secondary(unsigned long boot_phys_offset, - unsigned long arm_type, unsigned long atag_paddr, unsigned long cpuid) {